engine/schema: add upgrade path for source 4.11.2.0 version by yadvr · Pull Request #3417 · apache/cloudstack

yadvr · 2019-06-23T18:38:10Z

This adds a missing upgrade path for source version 4.11.2.0. Without
this fix, 4.11.2.0 users won't be able to upgrade to 4.11.3.0.

The issue for 4.11.2.0 users will be that the expected DB upgrade exception will not be thrown around the 4.11.3 systemvmtemplate checks and post-upgrade any registered 4.11.3.0 systemvmtemplate will not be automatically used for systemvms and VRs.

We couldn't catch the bug before because an explicit upgrade from 4.11.2.0 was not tested (at least by me).

Workaround: (based on https://github.com/apache/cloudstack/blob/4.11/engine/schema/src/com/cloud/upgrade/dao/Upgrade41120to41130.java#L156)

Set the 4.11.3 template to SYSTEM type
Update template ID for systemvms
Update the router.template.* for each hypervisor
Update minreq.sysvmtemplate.version to 4.11.3
Update template checksum (optional)

Mgmt log reference:

2019-06-24 12:35:26,589 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Grabbing lock to check for database upgrade.
2019-06-24 12:35:26,611 DEBUG [c.c.u.d.VersionDaoImpl] (main:null) (logid:) Checking to see if the database is at a version before it was the version table is created
2019-06-24 12:35:26,621 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) DB version = 4.11.2.0 Code Version = 4.11.3.0
2019-06-24 12:35:26,621 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Database upgrade must be performed from 4.11.2.0 to 4.11.3.0
2019-06-24 12:35:26,623 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Running upgrade NoopDbUpgrade to upgrade from 4.11.2.0-4.11.3.0 to 4.11.3.0
2019-06-24 12:35:26,640 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Cleanup upgrade NoopDbUpgrade to upgrade from 4.11.2.0-4.11.3.0 to 4.11.3.0
2019-06-24 12:35:26,663 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Upgrade completed for version 4.11.3.0

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

This adds a missing upgrade path for source version 4.11.2.0. Without this fix, 4.11.2.0 users won't be able to upgrade to 4.11.3.0. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This reverts commit 5bfad44 because we'll need another RC on latest 4.11 branch towards 4.11.3.0.

yadvr · 2019-06-24T07:10:35Z

@PaulAngus let's do a 4.11.3.1, or recall on 4.11.3.0 as it's not announced/published yet.
@blueorangutan test matrix

blueorangutan · 2019-06-24T07:11:09Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

borisstoyanov · 2019-06-24T08:11:54Z

looks good, will check it out when we have Jenkins back up

blueorangutan · 2019-06-24T08:45:57Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1

yadvr · 2019-06-24T10:59:48Z

@blueorangutan test matrix

blueorangutan · 2019-06-24T11:00:31Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

nvazquez

LGTM

PaulAngus · 2019-06-24T14:43:54Z

@blueorangutan test matrix

blueorangutan · 2019-06-24T14:45:05Z

@PaulAngus a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2019-06-24T21:03:56Z

Trillian test result (tid-5)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 24847 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3417-t5-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Smoke tests completed. 68 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_scale_vm	`Error`	14.38	test_scale_vm.py

GabrielBrascher

LGTM

blueorangutan · 2019-06-25T00:15:08Z

Trillian test result (tid-8)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32833 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3417-t8-vmware-65u2.zip
Smoke tests completed. 69 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

yadvr · 2019-06-25T07:12:10Z

KVM env test failed due to backend IP-range issues, I've rekicked the test job.
Will merge this as soon as the KVM tests are in.

blueorangutan · 2019-06-25T15:55:34Z

Trillian test result (tid-12)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 29693 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3417-t12-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 69 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

yadvr · 2019-06-25T16:01:59Z

@PaulAngus 4.11.3.0 RC2 can be cut now out of latest 4.11 branch. Thanks.

yadvr added 2 commits June 24, 2019 00:03

engine/schema: add upgrade path for source 4.11.2.0 version

3dd6059

This adds a missing upgrade path for source version 4.11.2.0. Without this fix, 4.11.2.0 users won't be able to upgrade to 4.11.3.0. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Revert "Updating pom.xml version numbers for release 4.11.4.0-SNAPSHOT"

1c95311

This reverts commit 5bfad44 because we'll need another RC on latest 4.11 branch towards 4.11.3.0.

yadvr added the Severity:BLOCKER label Jun 23, 2019

yadvr requested review from DaanHoogland, PaulAngus, andrijapanicsb and borisstoyanov June 23, 2019 18:38

yadvr modified the milestones: 4.13.0.0, 4.11.3.0 Jun 23, 2019

apache deleted a comment from blueorangutan Jun 23, 2019

yadvr requested review from GabrielBrascher, kiwiflyer, nvazquez, rafaelweingartner and wido June 24, 2019 07:11

apache deleted a comment from blueorangutan Jun 24, 2019

nvazquez approved these changes Jun 24, 2019

View reviewed changes

GabrielBrascher approved these changes Jun 24, 2019

View reviewed changes

yadvr merged commit 6f1fc18 into apache:4.11 Jun 25, 2019

Conversation

yadvr commented Jun 23, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Uh oh!

yadvr commented Jun 24, 2019

Uh oh!

blueorangutan commented Jun 24, 2019

Uh oh!

borisstoyanov commented Jun 24, 2019

Uh oh!

blueorangutan commented Jun 24, 2019

Uh oh!

yadvr commented Jun 24, 2019

Uh oh!

blueorangutan commented Jun 24, 2019

Uh oh!

nvazquez left a comment

Choose a reason for hiding this comment

Uh oh!

PaulAngus commented Jun 24, 2019

Uh oh!

blueorangutan commented Jun 24, 2019

Uh oh!

blueorangutan commented Jun 24, 2019

Uh oh!

GabrielBrascher left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Jun 25, 2019

Uh oh!

yadvr commented Jun 25, 2019

Uh oh!

blueorangutan commented Jun 25, 2019

Uh oh!

yadvr commented Jun 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

yadvr commented Jun 23, 2019 •

edited

Loading